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

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



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