Merge "codec2: Fix nsec to msec conversion in C2Fence" am: bf22d2895e am: 97ef497ccf am: 372af10f99 am: 84eec2d3df

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

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