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

Change-Id: Ib14025bc6a91a016dbe6c479a6f2c54588066937