Merge "Improve strings for share sheet and intent resolvers." into rvc-dev am: f4d1abb3 am: 26b51b84 Change-Id: Ib6efb3eaea37b8b0845b8776ec3b396ef63f1f81