Merge "Add "android.software.preview_sdk" feature" into oc-dev am: 89f74db432
am: 16c24c350b

Change-Id: I1e3b8938bc3702cbebb4209d53ed0bad7b32e2ab