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

Change-Id: I58dfc48d527baa88c024be4d943ea1779d6705ef