Merge "Merge "ShortcutPreference Toggle design." into rvc-dev am: 6acde7c21f am: 36a30b38b9 am: 3a059026bc" into rvc-qpr-dev-plus-aosp am: ed6a726216
Change-Id: I25d63fcb913f9d506e4ef3890662d54ed8eaf13a
This commit is contained in: