Merge "Merge "Test: Fix testFindAll result listener not set issue" into lollipop-mr1-cts-dev am: 548f71f142" into marshmallow-cts-dev am: af466e333b am: 51dfa92333 am: 91a1b12349 am: adff69b305
am: 1c7f551e7e

Change-Id: Iabeefe3784394763fb6be61f843e02cde3577d53