Rebase android-components patches to 60.x.x