Merge "Merge "Merge "Merge "DO NOT MERGE Add test for bug 62187433" into lollipop-mr1-cts-dev am: 6ad450940a  -s ours" into marshmallow-cts-dev am: e523550220  -s ours" into nougat-cts-dev am: 56bb432db6  -s ours" into nougat-mr1-cts-dev