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

Change-Id: I675bb70cba37003f58c90d50cd9ab25f658ba385