[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 4717ca5721 -s ours am: f5d1330bac
am: 68e7f7bbca

Change-Id: I000dc0caa0d1e3e64f8e712ce42cb6db273a1e53