[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
am: b63599b947 -s ours
am skip reason: change_id Ic9648fed01e9ae5bb1331db85a743892b5d13d09 with SHA1 e7bdc40b0c is in history

Change-Id: I73549f9078f9fb965e48876d810b3d651e20da8a