[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 087bf32be2 -s ours
am: 366954c3d9 -s ours
am skip reason: change_id I20eda906f06b84b148b1b94439e8092d65ea6b4c with SHA1 5c35f40326 is in history

Change-Id: Ie6ef4cb1113bbdcb93e1ce7f1d1f39b2242d49ea