[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: ced3e81f4a -s ours
am: d4ba83ca3f -s ours
am skip reason: change_id Iade42e1a78a3f2fdd0fe86e274028138114ba6aa with SHA1 99c42afb19 is in history

Change-Id: I730df008d16c897e76a078ca2d744afbe34aa5cb