Merge "Add registry for tracking leaking surface controls" into udc-dev am:...

Merge "Add registry for tracking leaking surface controls" into udc-dev am: 61df74d8 am: b6e90996

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



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