[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: c111d2d319 -s ours am: 330107719b -s ours
am: cd320a6b52 -s ours
am skip reason: change_id I231c58c0cdb60b8e7dcf9c017d247ee6f9f01c75 with SHA1 500c6a6bdb is in history

Change-Id: I4f75bc133322c2ada81e0e6a231903f2d5dd7d7f