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 am: e7ebddb8

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

Change-Id: I374926b60b58d2867dd9553bf962911a7493540c