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

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

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