[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 7e518e4fab
am: f0fcbccb52 -s ours
am skip reason: subject contains skip directive

Change-Id: Ieb9e5f4f844d481e08f24dc3178e0726068818e9