[automerger skipped] Merge "Tear down voice call before powering down" into...

[automerger skipped] Merge "Tear down voice call before powering down" into tm-qpr-dev am: 1bd8c7ae -s ours

am skip reason: Merged-In Ib9bef589d1e444e0c0bc26bd22a002b660e2dcbd with SHA-1 96d5266e is already in history

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



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