Rebase android-components patches to v91.0.1

boklmrequested to merge
boklm/android-components:bug_40059-v91.0.1-00 into android-components-91.0.1-11.0-1

Closes #40059 (closed).

Merge request reports