[automerger skipped] Merge "UK emergency alert app rename" into rvc-qpr-dev am: 3bdcdae23f
am: 35e1f0d189
am: 665c496449
-s ours
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14645166
Change-Id: I82b9bbad4b5fb6b48c07d1117f774bef9ca43abc
This commit is contained in: