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

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



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