[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 9f7476ad4c -s ours
am: 0c54f2c013 -s ours
am skip reason: change_id Ib11313bef8f129e109d11e656b29c9b753137265 with SHA1 25353557c1 is in history

Change-Id: Ie3f1b17e44d3ccb1899e37468d70f105c8a77f6d