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: I0707a8ab55eb3aa96b2f3107648db67f848256df