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: b32cf8c8 am: 89286d70

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



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