RESTRICT AUTOMERGE - Allow ResolverActivity to relinquish task identity am: 674aed9fb5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16303380

Change-Id: I777dddae85787cd7b7b55dcdb8621ca3fb6df8c8