[automerger skipped] Merge "Added more conditions for setup and tear down."...

[automerger skipped] Merge "Added more conditions for setup and tear down." am: e13a752c am: 957b998c am: 56600e97 -s ours am: 847d3647 -s ours

am skip reason: Merged-In I43b6230b717469e79d349ff9c44a0d0f896e9e2d with SHA-1 e75f690d is already in history

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

Change-Id: If5a05f8eb0bd11dc7a9810570334cbff4cac69da