[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d57e959e71 -s ours am: 9b2f502e0a -s ours
am:c22db3e73a-s ours am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1ebf0ccf2dcis in history Change-Id: I712ca737683eb8ecf584fdfbdf0378afce7fa0ca
This commit is contained in: