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

Change-Id: I40893ef552b065ac866e6a3d692fa15413e72a00