Fix test cases for impending Robolectric merge
The next merge of robolectric will return defensive copies of registered
ApplicationInfo, ActivityInfo, ResolveInfo, etc objects. Tests which
exploited the identity of these registered objects (e.g. expect mocks or
sublcasses to be returned) must be updated.
Some tests now rely on test-only resources. This necessitated declaring
test resources *BEFORE* actual car settings resources so that they are
prioritized by AAPT on merge.
Bug: 121048884
Test: make -j56 RunCarSettingsRoboTests
Change-Id: I45ea872615dd8b48f18dd57c53a11b4bf5b23252
5 files changed