Merge "Expose android.icu.text.CaseMap API" am: abb7b3d0e5
am: 1035fcf138

Change-Id: I455bfa421ffe194046b90cf77a5b168ca75b54fb