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: f4fb8c14 am: 256cbd1b" into rvc-qpr-dev-plus-aosp am: 5a275ab8

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

Change-Id: Ia58f7f41ee70a96f0d8acbbc477e7e6d513ec89b