[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3bf0911e61 -s ours
am: 7341604d9b -s ours
am skip reason: change_id Ib2980eb2298cc867635c9ed24350245235f06b9e with SHA1 a70e23afd3 is in history

Change-Id: Icab99c237464c470709125b9dd04a27a6ca11ff3