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

Change-Id: Ib292ca439ab2c0a6b17fde909c1ef116537048d9