[automerger skipped] Merge "Added more conditions for setup and tear down." am: 5cab1618cd am: 28b76bc0c0 am: 6b78728d26 -s ours

am skip reason: Merged-In I8f718d0af11b36c4a172a580de6a249b18aa73c8 with SHA-1 4ad64e5562 is already in history

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

Change-Id: I6ec87934d6f14e07a8e122e2507af930b606254f