Merge "Fixed data leak after emergency call" into tm-dev am: 4bdffb3c am: 00a1031e

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



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