[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 99bc15c4d5 -s ours
am skip reason: change_id Icfe61f4ce95a4299bb6056069fc5b8ce96ec62b8 with SHA1 5b2bb6743e is in history

Change-Id: Ia5e4f75f024cb25eef29ca41d9e70c16727d2fa0