Merge changes from topic "presubmit-am-cba7d776cb00494fa8e8b96fd7150942" into sc-qpr1-dev am: fa247f3720

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/CellBroadcastReceiver/+/16581130

Change-Id: I6a23a117be04130b2a59f65c25ee27b6ec9b79e6