Merge "Add missing extra when launching apps" into tm-dev am: 14a3861f

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



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