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

Change-Id: Iec3af50c2de2356e0e406b74c884ffbabce39166