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

Merge "Don't skip resume on transient-launch activity" into udc-qpr-dev am: 5ea204ec am: 57faee47

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



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