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

Change-Id: I652d912651f2f0140820cc40b7792bfe84ebd13f