Merge "Sent deactivation reason shutdown properly" into tm-dev am: 6f2d6240 am: b4d12d81

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



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