Merge "Merge "Fix the duplicate components in edit shortcut menu list." into...
Merge "Merge "Fix the duplicate components in edit shortcut menu list." into rvc-dev am: 22a0b13e am: f47351d4" into rvc-d1-dev-plus-aosp am: c4926bef am: e498f45a
Change-Id: I8cb07c79a1c728161256aeebb9a0dd1489f4648e