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

Change-Id: I51a9ee11fcc4d56663a60f6ef7809891fc194580