[automerger skipped] Merge "switch to updatable cellbroadcast apk" am: fac1f8f78d am: 59ee409588
am: e07cea80ed -s ours
am skip reason: change_id I30ac57d1f3dc259142d3354fdb4f14fc5f9ec02d with SHA1 ad5ab25f1c is in history

Change-Id: I6c306dad5c9a1b871531fed3347d5aba62806dbd