Renames AppModule and TestModule instances

Bug: 331594637
Flag: NA
Test: manually verified that ThemePicker app runs
Change-Id: I3af84e80f682dc20e230dfe57db94d5e5f575f15
3 files changed