Merge "Handle protection intent in base content capture service" into udc-qpr-dev am: 539d81dd

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



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