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: 811dad7e am: 88db7762 am: 332e9e76

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



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