Merge "Update UiAutomator Condition" am: 3a4967cd07 am: d206d78621

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

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