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

Change-Id: If1df20b9f61cb9c692ba72c2f43f83f177512e6c