Merge "Add null check on ActivityOptions before using it" into sc-v2-dev am: ecdb3cdbd2 am: 29509b34ed

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

Change-Id: I27199964893c1a3191e18d1f935c13cda8e9d6df