Bug 16626030 Getting the timing correct for when to clear returning activity options was difficult when Activities can be destroyed and recreated. Moving the returning ActivityOptions to the ActivityRecord forces the ActivityOptions to only apply to the correct Activity. Change-Id: Ib5400b157eb741ae484aae0cc83172a3db637a3e