am 9287f5d0: Merge "Hide FingerprintManagerCompatApi23" into mnc-dev

* commit '9287f5d0156d571ef801364295ce2443df579bb4':
  Hide FingerprintManagerCompatApi23