[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

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

Change-Id: I952a6e0e7bb1c1403110e4e761692173a3dec9aa