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

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

Change-Id: Ic513814159ed235386340b0485f490fec74a6f46