Merge "Relaunching activity to PAUSE state" into udc-qpr-dev am: 1d0fcb0f am: 94bffa73

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



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