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