Merge "[DO NOT MERGE] Added ContentProviderCursorWindowTest" into mnc-dev am: 394ba81ccb am: a8a1ce3bd0 am: 9f3e99778c am: 152633dee0  -s ours am: 86f0bb8cf1
am: 46853e1cc5

Change-Id: I33eda519104ea9bf15063b93e745c49411731039