Merge "Check lock-task mode if task_on_home is applied" into tm-qpr-dev am: 2016b1dc

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



Change-Id: Ifec394bfa5e6b9e9bf327dc1cae96b719386e308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>