Merge "Added more conditions for setup and tear down." am: 5cab1618cd am: 28b76bc0c0

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2007633

Change-Id: I85c9c3bbee9dbb95b6a5743cdc6f189aceb15e5c