Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo"