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

Merge "Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa34 am: 56e2b909" into rvc-d1-dev-plus-aosp am: 6efa9a45

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

Change-Id: Ie3e711f22ff8b960c895797d08f1d443cb090372