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

[automerger skipped] Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev am: 4b33be9f am: f5fc70b4 am: ba9c825b -s ours am: 1681372e -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: Ibff125a2d731554947924e7bd113dd9dbbd8c214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>