Merge "Test: Fix testFindAll result listener not set issue" into lollipop-mr1-cts-dev