[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 am: ccb405d3 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ie8eaa5ad4c750b5e27a1f00293c35881ab39e18a