Merge "Merge "Prevent exception when surrounding text retrieval" into rvc-dev am: 309cfa3431 am: f4fb8c1457 am: 256cbd1b51" into rvc-qpr-dev-plus-aosp