Merge "WatchDog: support dumping AIDL HALs" am: 4c0600b406 am: ac37ade768 am: 40b8fc37d4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ce40879a3dd677cd2a873d1b8bdf0c9392cd610