Merge "Add WM owners to SurfaceControlRegistryTests" am: 7384a2ec68

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

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