[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 0ed6696f2e -s ours
am skip reason: change_id I0f2a4d898ccfab7f5215d9bbb3c2c9fd4f7329cf with SHA1 9c448b4895 is in history

Change-Id: Id1b5c87371c791396918f6e4562d87b19b695c17