Rebase - Bug 40027 00

Matthew Finkelrequested to merge
sysrqb/android-components:bug_40027_00 into android-components-67.0.3-10.5-1

Initial rebase onto v67.0.3`.

Edited by Matthew Finkel

Merge request reports