Rebase android-components patches to 99.0

Rebase android-components patches from android-components-96.0.15-11.5-1 to android-components-99.0.3-11.5-1