Merge "Fix cts test android.app.cts.DisplayTest#testRotation." into oc-dev