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

Change-Id: I6dc6a8361400d36e52b47b12f4267739575bca37