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: 00a1031e am: 57d73c15 am: fbedf260

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



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