Merge "Merge "rename "Emergency Alert" to "Public Warning" per IT requirements" into rvc-dev am: 6ebe9ae0ff
am: 34a3ec22f4" into rvc-d1-dev-plus-aosp am: 860e66242a
am: 273123fa02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11814763 Change-Id: Id32495e5cc39a383a660f1d39dadd68cc0b37e81
This commit is contained in: