Merge "Change fingerprint enrolling animation to 4 colors" into pi-dev am: 66640d6412
am: 7691959d04

Change-Id: I517a30099c8f28ddbc6ab04bf6a94a339505c9f3