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

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



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