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

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



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