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

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

Change-Id: I61291aaa66017dfeda96103bd111d144dbd7beeb