Merge "Only trim applications UidStates in AppOpsService#trimUidStatesLocked" into main