Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo" am: 8c238b7dca am: 1f9ebb1971

Change-Id: Ib6bc308dbf5025bf249ec98413f5f2aeaafd45af