Merge "Ensure adb key store is instantiated before revoking grants"