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: I37f7107bfb0fb3d6dd99d8ecf10e8b6aa762c8a6