Merge "Move cell broadcast service module directory"
am: efa3cc419c

Change-Id: Ib742b26e57c2bbd1e3ea7bc766a35a7251b44221