Merge "Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am: 1cc6eceb am: 9d1842da" into tm-d1-dev-plus-aosp am: d473d70c

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



Change-Id: I3ea6c131f6246fc8ace5738d5464a1436a18ce5f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>