[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into...

[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6fb413e7 -s ours am: 7b70ad53 -s ours
am: f67fd2e5 -s ours
am skip reason: change_id I8106a8daecbdf2ec83430c417d4dd7e2307439f8 with SHA1 667040b8 is in history

Change-Id: Id4aee5bdfd1f7b4ffe7ec177b5dbf21143f2c1d4