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

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

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