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: 2781ea7e

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



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