Merge "Keystore 2.0: Add AID_USER_OFFSET to utils.rs"