Merge "Clean up ADB commands for letterbox and display API sandboxing." into tm-dev