Merge changes from topic "am-0afeeea03fd943a5b23d1b74a4f1418c" into rvc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix CDM package check" into qt-dev am: e0d7430c0e am: d2dcc48553 -s ours am: 8ce1ac7f93 am: e7a38c81fd am: 23eaa375f9
  [automerger skipped] RESTRICT AUTOMERGE am: 9ec3bf497e am: ee729e7a92 -s ours am: a552fc21c7 am: 811352be16 am: 7f4460ab0d