Merge "Always resume view when relaunching with preserved window" into udc-dev...

Merge "Always resume view when relaunching with preserved window" into udc-dev am: ee0da966 am: 05c70c7a

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



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