Merge "Revert^2 "Ignore testSetPolicyLevel_Adaptive"" into udc-dev