Merge "Add aborted start result." into oc-dev

author Bryce Lee <brycelee@google.com>

Tue, 27 Jun 2017 04:14:20 +0000 (04:14 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 27 Jun 2017 04:14:26 +0000 (04:14 +0000)
author Bryce Lee <brycelee@google.com>
Tue, 27 Jun 2017 04:14:20 +0000 (04:14 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 27 Jun 2017 04:14:26 +0000 (04:14 +0000)
diff --cc services/core/java/com/android/server/am/ActivityStarter.java
Simple merge
author	Bryce Lee <brycelee@google.com>
	Tue, 27 Jun 2017 04:14:20 +0000 (04:14 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 27 Jun 2017 04:14:26 +0000 (04:14 +0000)