Merge "Merge intent extra to deep link intent target for large screen devices"...

Merge "Merge intent extra to deep link intent target for large screen devices" into sc-v2-dev am: 4223ee98

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

Change-Id: I81f6a07456d2fbd3c10795caa5c0af2ef34fc1fb