Merge "RESTRICT AUTOMERGE Fix CDM package check" into qt-dev am: e0d7430c0e

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

Change-Id: I667080ebda79b3e9d926df10baa548ba606c66ef