[automerger skipped] Merge "Remove unused broadcast DATA_CONNECTION_FAILED" am: e4bd9e0db6 am: d00aa465f0 am: efb914be28 -s ours
am skip reason: Change-Id I459ed013baa3529fbd77253a7b670556577182d4 with SHA-1 147d2ba1a9 is in history

Change-Id: I2c97224aad2f644b9c66991ea3258638c2665f3c