Merge "Always show fp icon in portrait on keyguard" into sc-dev am: fdf2bc97 am: 72f604c5 am: 56a8be79

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

Change-Id: I0f1f3d50bcf92bfa4351c83d78f45a0713930c4b