[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: b80632f517 -s ours
am: c54d6f0a6f -s ours
am skip reason: change_id Ia37a39990f81e2b8965952c98a2538a3ac377259 with SHA1 f2b45790fe is in history

Change-Id: If1ce2b229a149da10d4073a3c53a27ff4cbd5ff8