[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ca8f152649 -s ours
am: ebb1107166 -s ours
am skip reason: change_id Ieb5298f552c800e60647be5a75f754f0df5b374d with SHA1 bdb5c17e60 is in history

Change-Id: I47b5241278fe73d32debe317414fa99ce7c02e59