Merge "Don't skip resume on transient-launch activity" into udc-d1-dev am: bc12ac9437 am: 90d61f14de

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

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