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

Change-Id: Ie5eecef02577c4aacbb84ab1ec4ca5e89d6e7850