Merge "Rescan face when user preses empty space on LS" into sc-dev am: 866753754b am: 847acc3926

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

Change-Id: I132b09d6652670477d5bd00877dbb4f67a808bae