[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: eb3b5d800a -s ours am: 505ac05bcc am: ce63520e16 am: 38c4c7feef -s ours

am skip reason: subject contains skip directive

Change-Id: Ibd10dae46ba05720f2457d68ce56b68f78ba4342