Merge "Verify there is no additional NavBar window added" into stage-aosp-sc-ts-dev am: b833725e87

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

Change-Id: I2959094907781726e02d94ccfa727f100edb8633