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

Change-Id: I0f90dc34ac35cf1d2ce9c9898945d74a88033f19