[DO NOT MERGE] Clean up sandbox and letterbox ADB debug commands Fix: 184937020 Test: N/A Change-Id: Ic246f66c4d579cdc637140f19fceb9aae76cb102