[automerger skipped] Merge "RESTRICT AUTOMERGE Fix CDM package check" into...

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix CDM package check" into qt-dev am: e0d7430c am: d2dcc485 -s ours am: 8ce1ac7f am: e7a38c81 am: 23eaa375

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

Change-Id: I335527fe570c0e028e9834c8d7577d637504f24b