Merge "Postpone checking for content protection permissions" into udc-qpr-dev...

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

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



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