Merge "Lock face when fingerprint is locked." into sc-v2-dev am: c6d86bbccf am: 6486c7b030

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

Change-Id: I50d15bd2fcf1c27ed9951942034ff7b7ad4d23e6