Merge "[Settings] Replace Robolectric#setupActivity()"
am: 6aee4f9548

Change-Id: I4113d68bb4363dc5c847ab802c0cee16d726e444