[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 58ee3e3057 -s ours
am: 1cab689a21 -s ours
am skip reason: change_id Id4609cad94db5358ac03231a0537468b81f3dd33 with SHA1 ee4efc6bee is in history

Change-Id: I4326f94af1e8710243d1842a6402945ee73f2128