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

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



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