Merge "Expose android.icu.text.Bidi API" am: 0753bca090
am: 77841856d2

Change-Id: I399d6e99abb56bd30f8ecb551197ab3091069a60