Merge "Restore static instances after test completes" into tm-dev am: 5b5318a6ce am: 8f1fc1a36f

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

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