[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 4b943499d0 -s ours
am: c63ccc73e3 -s ours
am skip reason: change_id I74e378c19586cb1d32088a8444f47595ad0ecdd7 with SHA1 af79780ac6 is in history

Change-Id: I5dfed630347784d6fb588c12d9b7e77b4a1a55e4