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

Change-Id: I0040e53b8a6608e89042e55d71c3850ee4cbea79