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

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

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



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