Merge "Small lint fixes for FingerprintDialog sample." into nyc-mr1-dev am: 34e5635f am: 37b50957 am: a0af9eda Change-Id: Ie3564e45c8555830bbfe014440f0c9d1ef9b777b