Merge "Sanitize cross-profile intents." into tm-dev am: 013d43186d am: f11809e595 am: c62e1fd3ce

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

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