Merge "Allow for the lock screen to have a different set of nav buttons" into pi-dev
am: bdf8770ae3

Change-Id: If479ab643ce821eb698d4d25429f0132cd887bb2