[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
am: 563e51b45b

Change-Id: If4fc7c427513847a6247d3f7bb37fdcd8e75a287