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
am: 32316465
Change-Id: Ida281cd80308107dc02bf2b282d1a00ccfdb51c5