The previous pr was reverted due to test failures. The failure was due to API not supported in order android version. The fix is in the second commit. [C++, Objective-C, Java style guides]: https://github.com/flutter/engine/blob/main/CONTRIBUTING.md#style