[automerger skipped] Merge "RESTRICT AUTOMERGE Fix CDM package check" into rvc-dev am: 7b8df2a8 am: 5aebb037 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7d2d1b716a308e8f8f320ee3fb900fb0205ffe5f