Merge "DO NOT MERGE Add test for bug 62187433" into lollipop-mr1-cts-dev