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