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

Change-Id: I2e91ecf59bbe8505d0544d43b7c55b6afe3d1eb1