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

Change-Id: Ie7c2f62a4852f666e02dd519efc9d79fc4f2d606