Merge "Special handling for intent coming from "welcome" notification." into tm-dev am: a73c850aa5
am: d21ef57315
am: d6dc2708c7
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>
This commit is contained in: