[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d4cb3e4c22 -s ours
am: 9097b610f0 -s ours
am skip reason: change_id I47c959a585bf9084b5795b2c071d2837118e62e9 with SHA1 4f305849de is in history

Change-Id: I78d70ee6e560b8f8f8e4def2c3636de0bdf0cb0d