Merge "Use clean calling identity to clear preferred activities am: 089b0bb4...

Merge "Use clean calling identity to clear preferred activities am: 089b0bb4 am: e7b15792" into rvc-d1-dev-plus-aosp am: 15544f58 am: d297e3ba

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

Change-Id: Iaa7d16149ad75bebcf13bc720b546204f9d6fe78