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

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

Change-Id: I8980d4eff87f3bb5e8d2da0db329da14622c7cc8