Merge "Postpone checking for content protection permissions" into udc-qpr-dev am: 7479aa933b

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

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