[automerger skipped] Merge "Move cell broadcast service module directory" am: efa3cc419c am: 608d940823
am: 1286f51be0 -s ours
am skip reason: change_id I8c798f48e3a342cc2ce29d1f7f199ae1337ff2d0 with SHA1 69573b9bec is in history

Change-Id: If14b48a31b57e188cd7ce8606fd55d53043cb536