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

Change-Id: I5516bb146bc2a5ac0ff23d5bebc6f8a61315babf