Merge "Make SpannableStringBuilder.getSpans thread-safe" into nyc-mr2-dev
am: 9e1f4e8891

Change-Id: If12164005160599947f591ee97a1d0a9af2f732e