[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a49538feaa -s ours
am: 6281920563 -s ours
am skip reason: change_id Iba2b0e6a1bff477aed2f1bbd9b599bbcf2eea942 with SHA1 b1f825f052 is in history

Change-Id: Ia592dcd2ace62e527527f1c1ee0be0d69bb5698f