[automerger skipped] DO NOT MERGE Add tests for BaseActivity and CarWizardManagerHelper am: 150f83de am: 681f94ee -s ours Change-Id: I3afe258e83bdb09e739b96978fd8d0fd5b0ada5c