Merge "Merge "Add strings for accessibility button chooser." into rvc-dev am: 17225fde" into rvc-dev-plus-aosp