Merge "DO NOT MERGE Add test for bug 62187433" into oreo-cts-dev
am: 003d01aa5d  -s ours

Change-Id: I97048ed54547ee0a1d9609345a55e09efb989d90