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: af4095c1 am: e8c7b7b4

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



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