Merge "IKeystoreMaintenance.aidl: document permissions correctly" into main