Re-ordered commits - Bug 40027 01

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

Re-order

Edited by Matthew Finkel

Merge request reports