Fix supporting modifying listeners in callbacks
Fix supporting modifying listeners in callbacks

 Bug: 17179442

Change-Id: I2d64f86395c0b1befb5c10b9c696330db1c96821

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base