Merge "Remove unsupported NetworkManagement AIDL methods" into main