Merge "Merge "Don't pass initial intents to the inactive profile." into rvc-dev am: 04ccfdfa am: d933374a" into rvc-d1-dev-plus-aosp