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

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

Change-Id: I2af2497a0af099094cee7a4e23e702592bd63df8