[automerger skipped] Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev am: 4b33be9fbd am: f5fc70b4c4 am: ba9c825bcd -s ours
am skip reason: Merged-In Ibe60793b381e61d56f57f8d2309754eedc84bddf with SHA-1 49ae8b0c3e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18281173
Change-Id: I2e745b1429343bd9857a9b8a7b0f2a900e7086f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: