Merge "Fix another issue with constructing SafeActivityOptions" into pi-dev
am: a6ef087d24

Change-Id: I4d9a60f52659367d951a511eb6ab032ec69508dc