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

* commit '56e1be700d76098bfdf1d72c0fedd2e77cc051fd':
  Add FEATURE_FINGERPRINT to PackageManager's feature list