Merge "Merge "Update the edit shortcut menu (1/n)." into rvc-dev am: 9eefc0ac am: 141a1ae0" into rvc-d1-dev-plus-aosp