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

Change-Id: Iea2e7e3f8e40755e7ca7f573e4e1038e844e8c4f