Merge "SurfaceFlinger: Dump on layer leaks" into tm-dev am: 917758ba am: 2b270411

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



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