tree 42309adad875c88a3ce231caae0c33bdec313101
parent 0f878e30bb5d3762a801c34995f067c9e90bc4e8
parent bb0c2a2a330c9903fbb3badc55d9a8ded3bc3299
author Adam He <adamhe@google.com> 1548801984 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1548801984 +0000

Merge changes from topics "dsiable_settings_2", "disable_cc_settings"

* changes:
  Added new APIs to let ContentCaptureService enable / disable the feature.
  Added new APIs to let Settings enable / disable ContentCapture