[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 3620a9cc21 -s ours
am: 0db422402c -s ours
am skip reason: change_id Idf5a1366c365b45a542eb63e110f32c5c1a662ce with SHA1 8acb6df218 is in history

Change-Id: I24d853378149cb24e977fc26b720e2d6656caee1