Merge "Fix "atest ResolverActivityTest" UPDATE_APP_OPS_STATS failure."