[automerger skipped] Merge "DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master" into stage-aosp-master am: fa93b63879 -s ours am: 53712ca9ff
am: f9701c093d

Change-Id: Iec5f9d82277129f4deecad95d7859bb13bf09aa0