Snap for 6048185 from 43ea416f756ce67bbd9c055b443f7d4a27abaef8 to r-keystone-qcom-release

Change-Id: I648ed469488a218c85911dcac3ae79f1dbd06fd2
diff --git a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java
index f54b258..30ee412 100644
--- a/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java
+++ b/prebuilts/androidtv/sample-inputs/app/src/main/java/com/example/android/sampletvinput/player/TvInputPlayer.java
@@ -452,8 +452,7 @@
         } catch (PackageManager.NameNotFoundException e) {
             versionName = "?";
         }
-        return "SampleTvInput/" + versionName + " (Linux;Android "
-                + Build.VERSION.RELEASE_OR_CODENAME +
+        return "SampleTvInput/" + versionName + " (Linux;Android " + Build.VERSION.RELEASE +
                 ") " + "ExoPlayerLib/" + ExoPlayerLibraryInfo.VERSION;
     }