[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 92786bce3e -s ours am: ebec37b2f8 -s ours
am: 8ff5f9cd05 -s ours
am skip reason: change_id I2f0d11636620f686f4cbd98ce1d6387fa93377c9 with SHA1 6cdd29bb61 is in history

Change-Id: I9ea3cd04a3d56975ca4e215cd7645a5367705378