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