[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master
am: 7b2e2fe15c -s ours
am skip reason: change_id Ibbd540dbb5baee46360d3fe9469212cfd8f550ba with SHA1 f7b2330d86 is in history

Change-Id: I0ab1111fb9895f53deacd723e2131c88057e488b