[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: 66c6409a -s ours

am skip reason: subject contains skip directive

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

Change-Id: I002947b4f3e08b664a225938ef336dd19d257427