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

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

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