Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011

Change-Id: If31ca44328dd6794977bba78e7c07d89e7d1c796