[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: f7838c64ec
am: 8f61481f7f -s ours
am skip reason: subject contains skip directive

Change-Id: I5e8360b55b6a8978787f6abdf2bf6465a760d616