Merge "Dump HWComposer when watchdog bites" into tm-d1-dev am: 135d1182

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



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