[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: a7d36a4257 -s ours am: 97d59b7500 -s ours
am: 423038f73e -s ours
am skip reason: change_id I64a01331273216829533f69f4422036e5598a547 with SHA1 c12771af1e is in history

Change-Id: I9b4398196840aa63dc0ab43e394966b04b25c452