Merge "Improve Android-changed documentation for removal of ZoneInfo"