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

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

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