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

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



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