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

Change-Id: I378c158b6c7218c086927740725f41302147700f