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 am: 015efeb5 am: 7fc07d39

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



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