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

Change-Id: I88d92b2cefe5756a8abc88ddd9243779215b8168