Merge "Revert "Disallow starting activities without new task from non-activity context."" into oc-dev
am: 367b880c02

Change-Id: I0a0d96048c0b3dd504d0c90dbf80a8299c4b96a4