Merge "RESTRICT AUTOMERGE Fix CDM package check" into rvc-dev am: 7b8df2a801 am: 9d01c1d91c am: 1d51eb9c03
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12939924 Change-Id: I0a79c493241d5a2f54f999f160ff710508096177
This commit is contained in: