[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: 0a68e9bfe7
-s ours
am: 59b1a2f6bb
Change-Id: I4179542b8cf8fee2ee0002eabdcb47afdf51b054
This commit is contained in: