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

Change-Id: I781b47a12226b7ef93ee7bf6edcc43554e6a32bf