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

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