Merge "Work on issue #78480444: Start tracking uid state in app ops" into pi-dev am: fcefeb25ac
am: 510aab7583

Change-Id: Idb3a115f87d2abe3974412111b56f8071f7d6dda