Merge "Move ICU.getDisplay* API into external/icu" am: 90b08a0800 am: e4ffee36a6
am: c4f6a20a21

Change-Id: I9170d2bbc3115de71b2f941bf26566bab20ebd96