Merge "Merge "Add CDM core test OWNERS file" am: c79f3cde am: 4b8f51c3 am:...

Merge "Merge "Add CDM core test OWNERS file" am: c79f3cde am: 4b8f51c3 am: 9128f5fe" into udc-dev am: 0cb6436e

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



Change-Id: I480c349b3c2e2a424c3f165d104ca7a7f327cebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>