Merge "Fix unable to launch app again from launcher" into sc-v2-dev am: 92047ed0 am: dff69bc9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15501965

Change-Id: Ib9d556875d14e6929dcc749810d8c6175eb4cc39