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

Change-Id: I16b1905466dd13c2b92e87003e698e6830078216