Merge "Revert^2 Fix testRegisterComponentCallbacksOnWindowContext flaky" into tm-dev am: 57edb1f7 am: c0e4da28 am: b098337e

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



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