Merge "Dump app-op uid states even when no package Ops"