[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 0f24028d66 -s ours
am skip reason: change_id Icca1852f77cb4cc70efa1f6ec95acfe013f8aac3 with SHA1 06df218bfc is in history

Change-Id: Id1ebfd80f63917690857a1ff935ac12c22884bbe