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

* commit '40481a7126095606865f6b4c172e1f8d9cbf22f3':
  Add FEATURE_FINGERPRINT to PackageManager's feature list