Merge "Adapt ICU 59 API update to Doclava changes." am: e048261656 am: 0fc0cc9dd8 am: 02b2b3d703
am: a59380177d  -s ours

Change-Id: I3a9f9db7bd9160b5c04f54f0371bc1fa4218230a