Merge "Revert "Deprecating the aidl for Android Protected Confirmation"" into main