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

* commit '72d9a4dfc70973f83a5d6d005dac7f83e1d5640b':
  Add FEATURE_FINGERPRINT to PackageManager's feature list