Merge "Update lockdown icon color" into pi-dev am: e248eeebc2
am: c73cfdee00

Change-Id: I6625d1dae33c43dbb4479d4fa3dcba5dfd3d149f