am 4cc8bafb: Merge "Restore broken CursorWindow.getType behavior. Bug: 5430009"

* commit '4cc8bafb4b10614dc881ed8121ce4754811e161d':
  Restore broken CursorWindow.getType behavior. Bug: 5430009