Snap for 8564071 from afff79c8641d51e53e49f564ce79993b474b6c8c to mainline-cellbroadcast-release

Change-Id: Id48cbf1055bd5f3bcdee205915578f41c3c3dd68