[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: dc3eb47087 am: 2a70e3bea6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib1a2571cc81a36369bbb67fce6eb796e218d17cf