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

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



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