Merge "Merge "Revising the function name related to user shortcut type." into rvc-dev am: eb04ef4f75 am: 4f1175397c" into rvc-d1-dev-plus-aosp am: 154b539a4a am: 4e9d606887
Change-Id: Id44f2adb2e5f9f0cff3da9f0f04b086c88858a65
This commit is contained in: