[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 27c0f8513f -s ours am: 2ee898a75f
am: b6b9eecc78

Change-Id: I5ffbac1bc1a4b28d5901bee6479c717eff28affc