There were a few conflicts, and we probably must move some of the patch for #40063 (closed) into android-components, but this should compile.
There were a few conflicts, and we probably must move some of the patch for #40063 (closed) into android-components, but this should compile.