Merge "[automerger skipped] Merge "Remove unused ICU4C headers included in android.text" am: 19d489d8 am: 0a472772 am: 9a827ab8 -s ours"