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: I861e8d5ed1710fea29599eca2d5075ccee32b3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>