tree e50b5ca769cf9043be9432e9482b7f6dfc21e05d
parent 3e212a0098db835443dc6f84decd0cc7451ea9b7
author Felipe Leme <felipeal@google.com> 1558041522 -0700
committer Felipe Leme <felipeal@google.com> 1558047951 -0700

DO NOT MERGE - Re-add ContentCapture support from standard SDK toolkit.

This reverts commit ef1c0b36ab402c9f936220dd4f64f4ac96f52e37.

Test: atest CtsContentCaptureServiceTestCases
Test: m update-api

Bug: 130726495

Change-Id: Iecda9df96722ac8a3184710796032b6c01bd8ea3