Merge "Remove HUN when user launches intent from its guts" into rvc-dev am: 89e616fa am: 0b227488

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

Change-Id: I0bfc1b82769f61fd4e2aae83e4182ff26cc308e2