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

Change-Id: I76b6a554e5551b56a79690b9e41f802deb574530