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: 075dd070

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



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