Merge "Fix timer and RtcpEncoder mutex nesting" into udc-qpr-dev am: 27467d304b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/ImsMedia/+/25418378

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