[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 57b49f3792 -s ours
am: cad9f5c852 -s ours
am skip reason: change_id I406048833eef518faecfc1f0164d14aa94387d97 with SHA1 af20550451 is in history

Change-Id: I794c5603e28777fb2762b2be8d320ee01f55369b