[automerger skipped] DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing. am: 200431be am: a9db8a0f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I516716a0dce0ac6b742142f9ae52e4c237ef1bdc