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

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



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