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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf6029ca6457bd3531b66dd816346ec69a533c5f