[automerger skipped] Merge "Merge "DO NOT MERGE - Removed ContentCapture...
[automerger skipped] Merge "Merge "DO NOT MERGE - Removed ContentCapture support from standard SDK toolkit." into qt-dev am: 11141109" into qt-dev-plus-aosp
am: 2fad0b64 -s ours
am skip reason: subject contains skip directive
Change-Id: Id67ed9fc43bae413f31a566f5a66d9c0e8db6b0d