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

[automerger skipped] Merge "DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing." into sc-dev am: eb267ed8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id9f5601ef8c052f4a46febe5cb8bd2d4044d5f7e