Android T Preview 2 (TPP2.220218.010)
Merge "Remove the workaround and re-generate libicuuc/src/shim.cpp"