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

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



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