Merge "Make sure the relayoutWindow is called when Activity restarted" into...

Merge "Make sure the relayoutWindow is called when Activity restarted" into tm-dev am: 909495e9 am: 046ee5ce am: 0ab90738 am: f77b1602

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



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