Merge "Restore broken CursorWindow.getType behavior. Bug: 5430009"