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

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



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