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