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