[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 1e7d39dc60 -s ours am: 00d5440fac -s ours
am: af1a3ab562 -s ours
am skip reason: change_id Ia14ad78b178e633cc0cbeaab8b7d5426df8cd914 with SHA1 806ee0afee is in history

Change-Id: I0d1934babb59e1a8e28800839158b15efe39fc5c