Merge "Remove unused ICU4C headers included in android.text" am: 19d489d8cf
am: 0a4727721a

Change-Id: I0e1fa80eb5ddadab6b1397d47f4fc1d9b7f33442