Merge "Do not allow ephemeral apps to access ShortcutManager"