Merge "Consider the lock-task mode while using FLAG_ACTIVITY_TASK_ON_HOME" into sc-v2-dev am: e171c540da am: f9b9412168

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

Change-Id: I962f3b7e9e86585d55d9d31b983fae4150400b47