Merge "[DO NOT MERGE] android.content.cts.ContentProviderCursorWindowTest--testQuery FAIL on 5.1_r22" into lollipop-mr1-cts-dev
am: a12265ddbb  -s ours

Change-Id: I3e1e6d3091b45d0bc9ebb98c501e2abe335a5105