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