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

Merge "Don't skip resume on transient-launch activity" into udc-d1-dev am: bc12ac94 am: d8c72d93 am: 6f6fee78

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



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