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

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



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