Merge "Remove manual pregrants for ContentCaptureService (now handled via...

Merge "Remove manual pregrants for ContentCaptureService (now handled via roles)" into tm-dev am: 18a113c4 am: 36c85684 am: 3a8995c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769071



Change-Id: I77c13f4eca53bda03d80dd1df6d3216f14b2b390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>