Merge "Snap tm-dev to android13-tests-dev" into tm-dev am: 100335fdc7 am: 919fd6e0a1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20514486

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

core/java/android/service/resumeonreboot/OWNERS

@@ -1 +1,2 @@
+aveena@google.com
 ejyzhang@google.com

core/java/android/view/ViewRootImpl.java

@@ -5045,7 +5045,7 @@ public final class ViewRootImpl implements ViewParent,
     }
 
     void reportKeepClearAreasChanged() {
-        if (!mHasPendingKeepClearAreaChange) {
+        if (!mHasPendingKeepClearAreaChange || mView == null) {
             return;
         }
         mHasPendingKeepClearAreaChange = false;

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java

@@ -102,6 +102,7 @@ public final class NotificationTest {
     @After
     public void tearDown() {
         mNotificationManager.cancelAll();
+        mUiDevice.pressHome();
     }
 
     @Test