Merge "Special handling for intent coming from "welcome" notification." into...

Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850a am: d21ef573 am: d6dc2708

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17722955



Change-Id: I4c4416803023ca2090e6eff9e0f069503fb99a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>