[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 0c68d39470 -s ours am: 60659ce9be -s ours
am: 1ee1330da8 -s ours
am skip reason: change_id I0dcb6b2b9015a6545103a267584dbaf45fdf213a with SHA1 ca61a6269b is in history

Change-Id: I91c89ab721ebd491bedf3badd196f35b9b258d59