Snap for 10447354 from 34e7e11ec02e65d0dd78bfe89c5de2c769a5be2b to mainline-cellbroadcast-release Change-Id: I82012cf1c338c789538fd52737cb8ab5599ebd15