Merge "Update UiAutomator Condition" am: 3a4967cd07

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2366619

Change-Id: I3c4466ad5522517f9553dfc1634c44732ec80d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>