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

Change-Id: I633a0a5a4c99b0a6d4b6d6350322d97f0269e41d