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

Change-Id: I2b2622c16d23347b8d0a709ea7e1b681e6be7480