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

Change-Id: I5c04e3ab7d229b0f63f600602a7e6f1e0713d1a9