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

Change-Id: I919ae4a5906deef0d1fdc840b1d8f8c318153702