Merge "Remove outdated javadoc patch for android_icu4j"
am: 1400ad0e77

Change-Id: I702123253c3a1780206fa935092b7fa6b64e4fe1