Merge "CCodec: Update watchdog to handle timeouts accurately" am: 36f42119...

Merge "CCodec: Update watchdog to handle timeouts accurately" am: 36f42119 am: d290c251 am: 7d5aa632 am: 3eab876d am: 66bf81b8

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2209255



Change-Id: Ic1530474794925956978f64a8721ab1ec3e0cebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>