Merge "Revert "[DeviceAware] Use AttributionSourceState in AppOpsServic..."" into main