[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 002e864ab7 -s ours
am: af39deafa7 -s ours
am skip reason: change_id I63f18bc50793010bd872d7e4b5df7ff66a56c07a with SHA1 f38b0acde8 is in history

Change-Id: I432fc36e1b437f7558517965f5578408f57449d9