Merge "Add shortcut manager support to Settings (2/2) b/28298258" into nyc-mr1-dev