Merge "Apply the correct activityOption" into udc-qpr-dev am: 73e2b5d53e

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

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