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

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



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