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

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

Change-Id: I23dfffbe50990798d20da783d40a5afe24824ce0