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

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

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



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