Merge "CTS: android.text.method.cts related tests failing" into marshmallow-cts-dev am: ca29aea82c am: 73fdcf2adf am: 289f4fb50d am: 5e166a117b am: 296437ee05
am: 3428089d22

* commit '3428089d22fd0fa0202b438aa130a3a3fcc52d82':
  CTS: android.text.method.cts related tests failing