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