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

* commit '0578540e51ec52b516a3bf9ab9e41904cb0395a7':
  Hide FingerprintManagerCompatApi23