Merge "Add vibrator and power HALs to Watchdog dumps" into tm-dev am: 1cc6eceb am: ba7ac552

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



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