Merge "Log AppOp access events in DiscreteRegistry" into main