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: Ib9e96390eb5b388ce8cc65bc41071de860450083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>