[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

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

Change-Id: I480aa21196e5807104477d234f30867be2b547ec