Merge "allow com.android.cellbroadcastservice grant signature permission" am: a8c4669579
am: 15878e511f

Change-Id: Idf30a1368ee85dffc0fec7993c6354b5e50dece0