[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: d6651f2888 -s ours am: 565a5cb181
am: 9618806e79

Change-Id: Icac58d9ebbcf92d40c51afde2abaa6a9a5a26e1f