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

Change-Id: Ieb5718fa3a2cb83f6a8cfe731ca7ad3f8ac772a7