[automerger skipped] Merge "Run sound trigger HAL watchdog on uptime clock"...

[automerger skipped] Merge "Run sound trigger HAL watchdog on uptime clock" into sc-v2-dev am: 4731dd14 am: 769b424d -s ours

am skip reason: Merged-In I913336837aff3e2c74c77f32aac24348612803f9 with SHA-1 812f0f27 is already in history

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

Change-Id: Ie13930350e2119eed5441715f07b20a167ddddd4