[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 80860803a4 -s ours
am: 0e80b14588

Change-Id: Ib875870cdd045beff56e16ff2357df404ae76270