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

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

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