Merge "Merge "Update strings related to intent resolver and share sheet." into...

Merge "Merge "Update strings related to intent resolver and share sheet." into rvc-dev am: ac8a5397 am: b92f8b98" into rvc-d1-dev-plus-aosp am: 16d91b8c am: 3e732630

Change-Id: Ifb0f07af4018dc5acda6c7a2aefe40b679c235f9