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

Change-Id: I530bcab2183ed178f8d6ac596abc63889765f704