Merge "Fix testGetSurroundingTextFailWithNegative{Before,After}LengthForA11y"...

Merge "Fix testGetSurroundingTextFailWithNegative{Before,After}LengthForA11y" into tm-dev am: a136110a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17891640



Change-Id: Icd99621a24985abd6c78aba40b3a0756e2a8071d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>