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

Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa34 am: f4fb8c14 am: faa7063a

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

Change-Id: Ic10c3aebed390d6d8d054091e1d7635d25b5fb17