[DO NOT MERGE] Added ContentProviderCursorWindowTest am: ea26447ece  -s ours am: d2de4a6c81  -s ours am: 9adb725949  -s ours am: 6d7df923c3 am: 9b51b1e5a9 am: 14680f7109  -s ours
am: 03fb9959a5

Change-Id: If9689f06cb892c329fda22e2079c615f6707477a