Merge "Sync the startConsentUiIfNeeded logics to master. We are missing the...
Merge "Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 2e05346f am: 14f45669" into nyc-mr2-dev-plus-aosp