[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 6e5dc84449 -s ours
am skip reason: change_id I4a702cb841740ff86f0ecb643a2449724be9d22b with SHA1 60e3d6fc0f is in history

Change-Id: I9caafdb26b424959c20e04bd1b39ded2246f0817