Merge "Update policy for ECOService switch to NDK binder" into main