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