Merge "Check content protection blocklist when fetching options" into udc-qpr-dev am: 463e0cb631

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

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