Merge "Fix face unlock does not work for top app in split screen" into tm-dev...

Merge "Fix face unlock does not work for top app in split screen" into tm-dev am: 16ebd44e am: c2e08706

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



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