Merge "Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions" am: 9c59242102
am: e23884eed9
am: f21625fe80
am: 54a9fd4e17
am: a80704330d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2003011 Change-Id: I5f797b570ec9d3f03a8dc3684c1275f49b78f501
This commit is contained in: