[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 6dd56ab1be -s ours
am skip reason: change_id If379604dd96f6ffdd1fd3d4ed224f474eb8536b8 with SHA1 b5a1ca632e is in history

Change-Id: Ieb5aba3a6c1d7d44b024f1e0416aedd600875053