[automerger skipped] Merge "Merge "Clean up ADB commands for letterbox and...

[automerger skipped] Merge "Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev am: 4b33be9f am: 1f0b8327" into tm-d1-dev-plus-aosp am: 82b942d0 -s ours am: 8efc78c5 -s ours

am skip reason: Merged-In Ibe60793b381e61d56f57f8d2309754eedc84bddf with SHA-1 49ae8b0c is already in history

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



Change-Id: I88d09c60ea69dca345cfb2654df76a0f5556cffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>