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

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



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