Merge "DO NOT MERGE Clean up ADB commands for letterbox and display API sandboxing." into sc-dev