[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 7b4781cb2a -s ours
am: ea94f2b5f6 -s ours
am skip reason: change_id I42a9409f1842370a61c0065c889f74cca9313a70 with SHA1 7993be3ca8 is in history

Change-Id: I60a7051aae5ac8b73653fddae01da6d49389a310