Merge "Merge "Test: Fix testFindAll result listener not set issue am: 69c73541a7" into marshmallow-cts-dev am: 4006f9d10a" into nougat-cts-dev
am: 8126f7f5ce

Change-Id: I4ddfcd04fadc35f65c5ad833437606b328fc4f4a