[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1faa33542b -s ours am: 7f4b994374 -s ours
am: d0179e0a05 -s ours
am skip reason: change_id I5ef84d95253ba12ef0ad36fe1f055a2e9d4844ad with SHA1 75e645817b is in history

Change-Id: I7b1b345149dc6918c0b581f5fd06f6dcf49c8afd