[automerger skipped] Merge "allow com.android.cellbroadcastservice grant signature permission" am: a8c4669579 am: 15878e511f
am: c2769be126 -s ours
am skip reason: change_id Id31e3ce6662db254b77178bc2d6ee9ec7532bc8d with SHA1 3da1104af0 is in history

Change-Id: Id4106088073a8956b445242c3b997560d5354be7