Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431

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

Change-Id: Idda9ab4bb5dddc617eb61e4b3355567627ca6fd3