Merge "Deprecate uses of Android Protected Confirmation" into main