Merge changes from topic 'am-9fd0a895a44f4e7ebb6eebb2d79a62a9' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev am: 4e0fc3cc
Enforce consistent sizes for arrays in SpannableStringInternal am: 83549088