Closes #40072 (closed).
Rebased from android-components-94.0.12-11.0-1 without conflict.
android-components-94.0.12-11.0-1