[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3162e8aa61 -s ours
am: adccb8feda -s ours
am skip reason: change_id I2f97c75036ec82748707c78058b9818ea42ae893 with SHA1 1e017ab7c3 is in history

Change-Id: Id131a237fabb2c1f37bd069190f7e2b7b3036ce1