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

Change-Id: I5f8ce2d2fd173b80d52ee70a11c6932698aaafdc