Merge "Deflake test to ensure airplane mode switches work as expected" am: d67e07c14c am: f0a82c3288 am: cc3132bc74

Original change: https://android-review.googlesource.com/c/platform/cts/+/1404540

Change-Id: I4ea538c9cef127e97e5a11671e033cbb256e2225
tree: 9d0962be0393f60c890bf4e5cec1725db270db42
  1. tests/