Snap for 8617226 from 49712a7cdde877cab6ad720af12f97248152bcd4 to tm-release am: 216c3cdad4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/CellBroadcastService/+/18501332

Change-Id: Iecb8e22b16e6335ec8e70248d4fdfba2bc719759
Signed-off-by: Automerger Merge Worker <[email protected]>