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

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



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