DO NOT MERGE: Check if cursor returns a row for archives. (Follow up)

Test: All tests pass.
Bug: 31783726
Change-Id: Id2153763339993441986f38f6a5120db3f964960
(cherry picked from commit 0b314e20ead50ddb9bf4d3302a6806d1b690a2ba)
1 file changed