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

Change-Id: I2b2ff9070d98a09d26cd9f60687d747401a01ee4