Merge "Sanitize cross-profile intents." into tm-dev am: 013d4318 am:...

Merge "Sanitize cross-profile intents." into tm-dev am: 013d4318 am: f11809e5 am: c62e1fd3 am: 73e86500

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



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