Merge "Merge "Fix returning activity that not in the task" into rvc-dev am:...
Merge "Merge "Fix returning activity that not in the task" into rvc-dev am: 3799331c am: 0871ed34 am: 7c6fca56" into rvc-qpr-dev-plus-aosp am: 40c99734
Change-Id: I187bc3228762b1372f7d98f1ccc29ac0b1babfb0