Merge "Merge "Add WM owners to SurfaceControlRegistryTests" am: 7384a2ec am:...

Merge "Merge "Add WM owners to SurfaceControlRegistryTests" am: 7384a2ec am: 8140edf2 am: fe3dd0f5 am: f00b9525" into udc-d1-dev-plus-aosp am: 6ad88c69 am: 475ad87d

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



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