Merge changes I93fef3dc,I19647b24

* changes:
  Add tests to exercise ActivityStarter precondition failures.
  Make ActivityStackSupervisor instrumentable for unit tests.