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

Change-Id: I9e49ba0af1772980a5a8fadd5f6b9d27efad5c8d