Merge "Run sound trigger HAL watchdog on uptime clock" into sc-v2-dev am: 4731dd1444

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

Change-Id: Ib951a8ac997005d6d201f514514c1655d8244e02