Merge "Fix not able to launch activity adjacently" into sc-v2-dev am: 0a7b7c37 am: d0776f91

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

Change-Id: Ibaeb71b1007fc7bc902d23c09dac2fa2330441fc