Merge "Handle teardown after incomplete setup in locksettings tests" into main...

Merge "Handle teardown after incomplete setup in locksettings tests" into main am: 55b9f102 am: 72c49baf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3499335



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