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
Change-Id: I6e19a1b5e812f5b6faab725fb2a5b1fe02fc172a