Fix listeners not getting called when AVD falls back on UI thread
am: 853b23d1fa

Change-Id: I003783a5f1d27af5f9b418b2ff35014ccbfca357