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

Change-Id: I0a9c0243b87bad281776b5560c8c57945934f855