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

Merge "Fix testGetSurroundingTextFailWithNegative{Before,After}LengthForA11y" into tm-dev am: a136110a am: 4000d3d6 am: 2499bcdc am: 2045301a

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



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