am 5f87f0b4: am 40481a71: am bf7cd01a: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev

* commit '5f87f0b4b76039039affc521896d02c915d53e36':
  Add FEATURE_FINGERPRINT to PackageManager's feature list