[automerger skipped] Merge "Ask for user consent before resolving personal...

[automerger skipped] Merge "Ask for user consent before resolving personal intent in work profile" into udc-dev am: ca9e2463 -s ours

am skip reason: Merged-In I32a8960d0a59f26752ad838ba6c3aee3c4d64be0 with SHA-1 13b8f773 is already in history

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



Change-Id: I113ca1334a2edd0326c948e5847f2abe8b5c17c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>