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

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



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