Merge "Couple tweaks for surface control registry" into udc-dev am: 2ba4c12b83 am: c78a62b676 am: 6c2c32e93c am: d70bc30bbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21482745 Change-Id: I93e23b3e9cab5832940d19a9122a44865ed9ff5d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: