Snap for 8564071 from a06f3e32ddac3d4ed41805756b225eb040844c19 to mainline-cellbroadcast-release Change-Id: I6ed6113387179625c9ad7cb1ee18f152e03078f6