[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 639e0bdf4f -s ours am: 11b00da8eb -s ours
am: 3dfd2ebea7 -s ours
am skip reason: change_id I12c299b18f26a6135dc8573693318679f443b5df with SHA1 78bc12304a is in history

Change-Id: I9b7c67434b22483a2f3b5b11d748c5abe5c694c4