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

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

Change-Id: Ifc2d45e026d33c74746bdb39bee676cc5f5a9e1e