Merge "Update UiAutomator Condition" am: 3a4967cd07 am: 82eade37fc

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

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