[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 5cfe24991e -s ours am: 372aaa1667 -s ours
am: 8457a9034a -s ours
am skip reason: change_id I8b74ae19788aaaca75ad44c465f7dc458117ccf1 with SHA1 4eb6999bbd is in history

Change-Id: If159977fd962f3483f651739ae0b313f762b3f26