Merge "Change fingerprint dialog radius to 4dp" into pi-dev
am: b334c84a97

Change-Id: If0a0852f7a409ad661e70ce7a9302d1f80932758