[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 2bbde82613 -s ours
am skip reason: change_id I2bc088c2ccc60d30189595604a90cd42ce9331c3 with SHA1 23f0734341 is in history

Change-Id: Iade885b78819d25fb89fb24f778c869c01c8120c