[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 69a1fd86d3 -s ours am: 5ccd3e3c39 -s ours
am: 203ab466d7 -s ours
am skip reason: change_id I24f07ba89ba6e6dac8adc2a6bb654d75d2b73d3e with SHA1 e3b772e0f7 is in history

Change-Id: I1294a1c17d2e17fd1e03690bedd5d671b6601959