Merge "SurfaceFlinger: Dump on layer leaks" into tm-dev am: 917758ba88

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

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