am fd4e5664: Merge "Fix PackageManagerSettingsTests and add KeySet info." into mnc-dev

* commit 'fd4e5664528f61b7ac2164ec8ec2206da9deebff':
  Fix PackageManagerSettingsTests and add KeySet info.