Fixes WallpaperPickerGoogle Studio build

Fixes the resource issues introduced to Studio by ag/25842216 and ag/25839209

Fixes: 323334670
Flag: NONE
Test: Manually built and ran all AOSP and Google targets
Test: Manually ran instrumented and deviceless tests for all targets in
Studio and with atest

Change-Id: I4aa91e6a22f2eb825e770dcd4049ce312d66038d