[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 473a9f7d6d -s ours am: 3c7679b896 -s ours
am: 7977efdf8d -s ours
am skip reason: change_id Ia7f8c4578dc1ba649b52cb76e0aa131c46d69c6f with SHA1 50333b2df7 is in history

Change-Id: I8f9852b0ecdceb0616a5d102767222f06851c90c