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

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