Merge "Make sure the relayoutWindow is called when Activity restarted" into tm-dev am: 909495e9

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



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