Merge "SettingsLib: Remove minSdkLevel to use default" into udc-dev