[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: aa3afd9fa8 -s ours am: 84312b6396 -s ours
am: 97fa980e9d -s ours
am skip reason: change_id I8c96c0c822f50b12b9f703bef0e64142e3b14bc8 with SHA1 a559c4d21a is in history

Change-Id: I4140f8c28d2ee8787b9e8e87ba7b6903088711e9