Merge "[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0172a23b1a -s ours
am: 53f3455949

Change-Id: I64e5c4c3dadb3bb436ed138181a95c2607d9d947