Bug 40045 00

Matthew Finkelrequested to merge
sysrqb/android-components:bug_40045_00 into android-components-73.0.3-10.5-1

Closes #40045 (closed)

(This branch is based on #40043 (closed), and should land after that)

Merge request reports