[automerger skipped] RESTRICT AUTOMERGE - Allow ResolverActivity to relinquish task identity am: 674aed9f am: 926b30f0 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib77914b46ab22febe50e639e4ff62e35adbe56b5