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

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

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



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