[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b3696d657d -s ours
am: 026441fb64 -s ours
am skip reason: change_id Ic9046fa1839a2aed313702f73f1c809d7879490b with SHA1 ae0387c5be is in history

Change-Id: I5026ebe51d2e8e7fef5a6d8c760833fc475e9f14