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

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

Change-Id: I94b0a23dff8415b6a862e251ce164c9167e9591d