Merge "Check Sdk level before calling the DeviceConfig API" into udc-dev