[automerger skipped] Merge "Remove unused broadcast DATA_CONNECTION_FAILED" am: d8836ba33f am: 2d9062cc48 am: 626ceae57e -s ours
am skip reason: Change-Id Iac1730af0fbd17df60943e2b4495716d001d0d70 with SHA-1 06796273ca is in history

Change-Id: Ie0a0f2f5135270ab64c9feb14b6dc86893577a49