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: ff2abfb8

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



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