Merge "Small lint fixes for FingerprintDialog sample." into nyc-mr1-dev am: 34e5635f am: 37b50957 am: 3ec90763 am: f0fc9994 Change-Id: I49aa5fe4f0e6404b37043d1afe4d9806f0a3fcb9