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

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

Change-Id: I9650a4ee085cb531b37d6e3b441c570bd9c059fb