Merge "Couple tweaks for surface control registry" into udc-dev am: 2ba4c12b

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



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