[automerger skipped] Merge "RESTRICT AUTOMERGE - Allow ResolverActivity to relinquish task identity" into sc-v2-dev am: ab529ab9 am: e6ff5510 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I598c021d9986319b171ddf43aefd8630e390f466