Merge "Do not restart process of a finishing activity" into udc-dev am: f37f9d12

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



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