Merge "Update strings related to intent resolver and share sheet." into rvc-dev am: ac8a5397bc am: 994a6f3435

Change-Id: Id31d326c08a0b30d94a5e42aaf61b97280556a9d