commit f1abd1cee57a8ff0399091824070fdbd784cffa1
author Colin Cross <ccross@android.com> Thu Sep 07 22:38:23 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 07 22:38:23 2023 +0000
tree 89d65205c86c35e21f07b8688f8eea43c44fcc96
parent 63cfd0e961c04e4f0872792e0efc988303db7415
parent e99f90e85e352aece9aa8f00aa204a6ee8c1bc46

Merge changes from topic "cherrypicker-L89500000962957882:N78800001403169312" into aosp-main-future

* changes:
  fix(non linear font scaling): fix test timeout flakiness
  Fix flaky tests
  Fixes @Nullable issues SystemUI-tests
  Fixes @Nullable issues in System UI and WMShell.
  Fix more kotlin nullable errors in services.permission
  Fix runtime kotlin nullable error in ScreenshotDetectionControllerTest
  Fix NullPointerException in ControlsRequestDialogTest
  Fix tests broken by @NonNull annotation fix
  Fixes more  @Nullable issues in System UI and WMShell.