Merge "Revert "Deprecate uses of Android Protected Confirmation"" into main