[DO NOT MERGE] Added ContentProviderCursorWindowTest am: 69c560be2a  -s ours am: 7c8643050e am: 48ddeccbd9  -s ours am: a8e1fd0c63
am: 32f38784fd

Change-Id: If75a5df8a447b540d91b1274c073734c3422a61f