[automerger skipped] [DO NOT MERGE] Clean up sandbox and letterbox ADB debug commands am: 761988f2 am: aa665a42 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I68f7490c79761db962ec35c6966699f8e9a7ee27