Merge "Ask for user consent before resolving personal intent in work profile"...

Merge "Ask for user consent before resolving personal intent in work profile" into udc-dev am: ca9e2463

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



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