Merge cherrypicks of [9734022, 9734337, 9733748, 9733749, 9734338, 9734339, 9734401, 9734402, 9734403, 9734404, 9734405, 9734023, 9734456, 9734340, 9733750, 9733999, 9733853, 9734000, 9734117, 9734341, 9734342, 9734049, 9734343, 9734458, 9734001] into rvc-release
Change-Id: I390f9f3e13501e22321afdc68af1dd55b91c0628
diff --git a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
index cf76385..fee8454 100644
--- a/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
+++ b/java/com/android/dialer/app/voicemail/LegacyVoicemailNotificationReceiver.java
@@ -65,7 +65,7 @@
+ ", PREVIEW_SDK_INT="
+ Build.VERSION.PREVIEW_SDK_INT
+ ", RELEASE="
- + Build.VERSION.RELEASE_OR_CODENAME);
+ + Build.VERSION.RELEASE);
return;
}