[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am:d69430249d-s ours am skip reason: change_id I7624257e4cffc690f0df4c844b23cd2accddca4b with SHA1105542679fis in history Change-Id: Ic45c1b4f5797f751986f2e6654738c9e778209cc
This commit is contained in: