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

Change-Id: I11aee7e90d9ce9680933e2d3433a0159513c435c