Merge "Use Settings.Global.putInt for PACKAGE_VERIFIER_ENABLE" into nyc-mr1-dev
am: 65889f7e26

Change-Id: I824e15909772c214cfc0136d29a70a0e80a0a868