Merge "Merge "The way to determine hasStatusBar is not correct" into android12L-tests-dev am: 2032ac9bb8" into android13-tests-dev