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

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

Change-Id: I61e803ecfed466bd8e55df057a8d98a72a880d79