[automerger skipped] Merge "Merge "Move cell broadcast service module directory" am: efa3cc419c am: 608d940823" into qt-qpr1-dev-plus-aosp
am: 008535edde -s ours
am skip reason: change_id I8c798f48e3a342cc2ce29d1f7f199ae1337ff2d0 with SHA1 776242c0c6 is in history

Change-Id: Id26e88557537594d0f776cf60d3dd30e1beb75bf