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

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

Change-Id: Iab0ad2e55f21ba464ae1b7d4c3ac3252638f711b