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: Ib1f6d16868ba3f566993c339cf2fa8899cb512c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>