Merge "Fix listeners not getting called when AVD falls back on UI thread" into nyc-mr1-dev am: 69115b8e29
am: ccc3794f77

Change-Id: I0e4fea7a87e84d7a211d90380f07ad117fddd4d1