Merge "Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev am: 57edb1f7 am: 5546e306" into tm-d1-dev-plus-aosp am: cae3a18d

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



Change-Id: I6394cbe8fcf8a3513ba0b2fd29cc5fba016fa4d0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>