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

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



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