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

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