Merge "Add "android.software.preview_sdk" feature" into oc-dev