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

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

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



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