[automerger skipped] Merge "Remove unused ICU4C headers included in android.text" am: 19d489d8cf am: 0a4727721a
am: 9a827ab8c1  -s ours

Change-Id: I8f7a81aa6410832438f6a7ccb9cb8903dec9c6c1