Merge "Fix lint issues in AsymmetricFingerprintDialog sample. am: 6b36f3f8 am: 6e4e2830 am: 32623f0f" into nyc-mr2-dev-plus-aosp