Merge "testGetPasswordExpiration failed during cts test" into android12-tests-dev