[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: d57e959e -s ours
am: 9b2f502e -s ours
am skip reason: change_id I1f2564837c33cd4c6c3db6aac3cbaf8c09707da9 with SHA1 ebf0ccf2 is in history
Change-Id: I4926fbce88d1245645276e34bbaaf96d185a3d32