Merge "Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa34 am: f4fb8c14 am: 256cbd1b" into rvc-qpr-dev-plus-aosp