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

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

Change-Id: If6878373ab8c1e11a6caf590db4e19e4ebe2c8a5