[automerger skipped] DO NOT MERGE Clean up ADB commands for letterbox and...

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

am skip reason: subject contains skip directive

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

Change-Id: I656c2c247c4d726ec174d1affaf48215885ad60c