Merge "Keystore2: Integrate getState method of IKeystoreMaintenance AIDL."