Merge "Do not change launch mode to FF is FS explicitly requested" into sc-v2-dev am: 7c2508117c

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

Change-Id: I339ec385c2214fb3e7406c1b6ab4c2986365e46b