Merge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev am: 55ae317213
am: e310042df2

Change-Id: Iafdffc033f6198feb545538466b92a820fbc3b5c