[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: d3bbda3565 am: a2cebf686d -s ours am skip reason: subject contains skip directive Change-Id: I2a2c61a02c6a7d8a18812d7812252f4cfde0b8b0