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

Change-Id: I4d44e5aa76fc14ddb5049d617650a19d1bf9255e