[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 6f55a2fd6d -s ours
am skip reason: change_id Ia589938a885c0bd776d79955bc7c9fb56090808a with SHA1 dbd18c91f2 is in history

Change-Id: I585617de27cab1352d0db0e0a297cd67f50828b2