[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 0797faf4f4 -s ours
am: cbcab37660 -s ours
am skip reason: change_id I705adb517bc5cdd70c4f45fa627a274e4503dd2c with SHA1 1d5ca59dfc is in history

Change-Id: I79a396c9610d28ebf160aacb7196cd7d9d2a72fb