[automerger skipped] DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit. am: 911cb1fa76

am: 3fe70c6af0 -s ours
am skip reason: subject contains skip directive

Change-Id: I1ee99dd3b4ac4243e0fb756624d01e8141ea147e
This commit is contained in:
Felipe Leme
2019-05-23 15:39:46 -07:00
committed by android-build-merger

Diff Content Not Available