[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: afc87d309e -s ours
am: 3ec3e42074 -s ours
am skip reason: change_id Ief1c0eaed98d2a196bca066bfeb83a16e4410887 with SHA1 6a0bd8fd7b is in history

Change-Id: I1d28b9a7ed52a28309afa14dc5be11dfbca63b55