am 9984f0ac: am c3973058: am b381d697: am 073bfb9b: am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev

* commit '9984f0acfdc8982946e0e70a08b67828d4d971cf':
  Ensure per package and per UID state share same package settings.