[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: b72ef060d7 -s ours
am skip reason: change_id I59e30906fce4dad6970787cdbe400ab8c56d6bbf with SHA1 de6af39790 is in history

Change-Id: I6e31a62887483d826975c797dfa7451624eaa665