[automerger skipped] Merge "Add geo-fencing for cellbroadcast" am: da49c2c1...
[automerger skipped] Merge "Add geo-fencing for cellbroadcast" am: da49c2c1 am: c0fd8ff8 am: 82e27be1
am: e32084d1 -s ours
am skip reason: change_id Ibfff780eafba3b9918b8de3d91de7a1a7a487cf0 with SHA1 38fd6ca4 is in history
Change-Id: I3c320cc152737bebd2da080e3a6987ca5a71ff6f