Merge "Resume stopped preserved window when relaunching visible activity" into...

Merge "Resume stopped preserved window when relaunching visible activity" into udc-dev am: 5d0abd46 am: f1d90275

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



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