Make PickerDataLayerTests consistent with master

Bug: b/221064027
Test: atest

Change-Id: I10e714a3209680b3b8c96ec3d156ca7e26f1820f
Merged-In: Id7c744e46d61b4b807bc1a723d9ae8337ff2060d
1 file changed