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

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



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