Merge "RESTRICT AUTOMERGE Fix CDM package check" into rvc-dev am: 7b8df2a801 am: 9d01c1d91c

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

Change-Id: I934baa3e61d896688e6a44c654bffe1a7b331695