Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY"