[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 639116d20f -s ours am: 74c2c255b4 -s ours
am: 8a1338d963 -s ours
am skip reason: change_id I0f9ac646b953d8831f47f28b2f20df90d9b028d9 with SHA1 209f1362de is in history

Change-Id: I4edf69c3fded7aa7bdd0e6a66d5c0212367ebba8