[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
am: 49f3c17e52

Change-Id: I539fe84acb5b786a7bbd7e621c344ac1d1a35563