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