Merge "Replace internal APIs in android.webkit.UserPackage." into main