Merge "testGetPasswordExpiration failed during cts test" into android12-tests-dev am: 058604c436

Original change: https://android-review.googlesource.com/c/platform/cts/+/2115629

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