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

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

Change-Id: I553345b068c69b3a2ad5dfe5efd4b3fc658d37aa