[DO NOT MERGE] Added ContentProviderCursorWindowTest am: b60929d93f am: c8a472984b  -s ours am: 899c56cdd6
am: bd4e8772ad

Change-Id: I9fb5f95aecd2eca2402098c2861c7ce060f7ae24