Merge "Add a primary action to slices from keyguard slice provider" into pi-dev
am: 1031bf5f76

Change-Id: I072c144a846f7eeb14aa7e9c529fb35a3489b42e