Merge "Revert "[Mainline] Migrate android.utils package items""