Merge "Sync the startConsentUiIfNeeded logics to master. We are missing the package name when starting the activity now. am: 5e7fc7ccc8 am: ae21066a59" into nyc-mr2-dev-plus-aosp