[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 0da0033d7a -s ours am: 69841017f4 -s ours
am: 75e02fac60 -s ours
am skip reason: change_id I9901bd8685f2ad213d7d0efa88c51c9bba80a539 with SHA1 83cf9c312f is in history

Change-Id: I1dbf62809e0c813b41e750f58cd6153ec5d4d8bc