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

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

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