Merge "[DeviceAware] Re-add proxy methods taking AttributionSource in AppOpsService.aidl." into main