[automerger skipped] Merge "RESTRICT AUTOMERGE Fix CDM package check" into rvc-dev am: 7b8df2a8 am: 9d01c1d9 am: 1d51eb9c am: 389a5b61 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I040816b3c034444781e5be7138678402bac224dd