Merge "Wait for relaunching activity to finish sync" into udc-dev am:...

Merge "Wait for relaunching activity to finish sync" into udc-dev am: 94b48e8c am: a51ed207 am: 8854b0cc

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



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