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

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