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

Change-Id: I76d1c6d064221d835ac9425e25596301df23da52