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

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



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