Merge "Fix SpannableStringBuilder getSpans sort" into nyc-mr2-dev
am: 48d84c378b

Change-Id: I3935b667dd120825e13252ad13a63b027ebf4a49