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: e2aa1639 am: 0bd50a59 am: f17d907f

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



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