Merge "Fix activity relaunch test failure" into udc-qpr-dev am: af1b826b am: 86cc088f

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



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