[automerger skipped] Merge "Add CDM core test OWNERS" into udc-dev am:...

[automerger skipped] Merge "Add CDM core test OWNERS" into udc-dev am: 0df35457 -s ours am: 8177c72e -s ours

am skip reason: Merged-In I247b271fd71658fb80323842e8e0d7542464c4c9 with SHA-1 57252777 is already in history

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



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