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

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



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