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

Merge "Merge "Make sure the relayoutWindow is called when Activity restarted" into tm-dev am: 909495e9 am: 046ee5ce am: c885c27e" into tm-qpr-dev-plus-aosp am: 64e95fe1

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



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