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: I8816a1ae8ca9b9c1e1776cea85bc3d70a5b8061b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>