Merge "Use an activity instead of a fragment for SpeakEasySettings" am: 9af2e2913e
am: f2fb3796b5

Change-Id: Ia2adb765e4a063703e661141644e1ce898c2760d