DO NOT MERGE fix batch scan getscanresult wait time

Bug: 24672009
Change-Id: I508bcff7f63d4a230818aad16a25d87a362c2d3d
(cherry picked from commit 7587d4ddf07fd440a4a08795d96e3a95e869882a)
1 file changed