[automerger skipped] Merge "Add geo-fencing for cellbroadcast" into qt-qpr1-dev am: 854f077a
am: 5373a679 -s ours
am skip reason: change_id Ibfff780eafba3b9918b8de3d91de7a1a7a487cf0 with SHA1 a01e16d6 is in history
Change-Id: Ia6507a1f2d8e5c3155a7615d5e3b59485ae10193