[automerger skipped] Merge "[DO NOT MERGE] Clean up sandbox and letterbox ADB debug commands" into sc-v2-dev am: b8b7bdda96 am: 73466f154e -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib5f2c60100e3ba8b4bf2cf6ebacef3211a596ad8