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

Change-Id: I95ee22e76d7346bea65a645b84d13632afc46d4d