[automerger skipped] Merge "Fix OOB vulnerability in setGsm/CdmaSmsBroadcastConfigInfo" am: 8c238b7dca am: 1f9ebb1971 am: ea23bd89c9 -s ours
am skip reason: Change-Id I18f9745174762a52fc20bfc7273c6b3fd2118da5 with SHA-1 77dc5c543f is in history

Change-Id: I22c2aa2968f66664ed65e31506b55d238a39ea7b