[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: f804472294 am: 6fbe6b84d1 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic40c94797324b8cecf241e83db2b0e0ad47f6022