Merge "Resend the EVENT_RESUME_NOW_FOREGROUND_CALL message after onCallHeld." into tm-dev am: 3865c72f am: 65968524 am: 43ba9e6d am: 1ec66790

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/18750981



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