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

Change-Id: I1065614fa58e7263a8e32975b79623195e6293f5