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

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

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