Merge "Fix NPE when exempting CDM apps from  auto revoke" into rvc-dev am: 19272a236b

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

Change-Id: I4ca80343a1d8c3218c22c6cf438724514a63ce07