Merge "testGetPasswordExpiration failed during cts test" into android11-tests-dev am: 59c927b13e

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

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