[DO NOT MERGE] Added ContentProviderCursorWindowTest am: 2cd286d0d7 am: 1af24128bc
am: 6a47e979d0  -s ours

Change-Id: I2d60decb3e50b41a141fbaddb0e53b9d08eadc8b