Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053

Change-Id: I2eba7685c56d4931f63974b6bfcf13fbb2ab2345