[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 9ed5ee986e -s ours am: 192858f513 -s ours
am: 00b003de79 -s ours
am skip reason: change_id I3671f9aedcd13d4e7874384ce1473627e6fe6d77 with SHA1 c850ed257a is in history

Change-Id: Iafbce5fa45027b53342fc53122fb036e09838561