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

Merge "Use clean calling identity to clear preferred activities am: 089b0bb4 am: 18b13019 am: 18a483e0" into rvc-qpr-dev-plus-aosp am: a3fd0aab

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

Change-Id: Ifa39b5899d0e340ae6e8cd299fcc8fac9cc46d33