Merge "Add registry for tracking leaking surface controls" into udc-dev am: 61df74d896 am: ff2abfb8c4 am: efc68722d5

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

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