[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 96be24dec6 -s ours
am: 303b7be0b9 -s ours
am skip reason: change_id I8b74ae19788aaaca75ad44c465f7dc458117ccf1 with SHA1 4eb6999bbd is in history

Change-Id: I57193963b176c0294d24681edc5afd8de186f8ef