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

* commit 'b71eca07d07f80656efcfa673a89feab821c857b':
  Add FEATURE_FINGERPRINT to PackageManager's feature list