am ecfbd588: am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev

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