Merge "Add Build.Version.RELEASE_OR_PREVIEW_DISPLAY" am: a789b92644 am: e3086a9896 am: ffa0f38936 am: 4c7fba2811 am: 86db26a61f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2003053 Change-Id: I1b60496622945f905bb8c74c07118ada27fbb6ae
This commit is contained in: