Merge "Update compatibility for UI change" am: 4975dc9936

Original change: https://android-review.googlesource.com/c/platform/tools/test/connectivity/+/1989912

Change-Id: Icf7b89db58750852decd80aaab42b01e80d8bbe7