Merge "Cut StatusBarHeight when takeScreenshot" into oreo-mr1-cts-dev