[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: cc3e2f8a6e -s ours
am: 28c265faa2

Change-Id: I36c9011dfd15d2b89684afe4e00f5655ac7383b5