Merge "Fix some comments in AndroidKeyStoreMaintenance.java" into main