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