Merge "[DO NOT MERGE] Clean up sandbox and letterbox ADB debug commands" into sc-v2-dev am: b8b7bdda96

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16440303

Change-Id: I85ca1cb3383a577441efa9f6a60982ad30a0a2f1