Merge "Fix ConcurrentModExc in TelephonyListenerManager" into sc-dev