Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75
am: 4c7a690479
am: f64b990432
Change-Id: Icff0532bda3b8e789cb909a23e7e7da8891db187
This commit is contained in: