Merge "Revert "Fix testRegisterComponentCallbacksOnWindowContext flaky"" into tm-dev am: bf10e8cc am: 65273cf9 am: 3fd90bbb

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



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