Allow users to specify if DDMS has already been enabled. am: f7b8d9768a
am: 3cfce94048

Change-Id: I8763541ba042e28016dcf6dfb6044c90c1a3d41d