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

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



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