[automerger skipped] Merge "Avoid home intent normalization if it is from...

[automerger skipped] Merge "Avoid home intent normalization if it is from trusted callers" into tm-dev am: 77652d15 am: ff6b29f4 am: 3f243dd0 -s ours am: 7914ab6b -s ours

am skip reason: Merged-In Ie192b226eac970e9e897214059abd1615f1c5cf5 with SHA-1 880b2906 is already in history

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



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