Merge "Check resumed state of activity before skipping resuming" into udc-dev am: b05a13af am: 4edd6188

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



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