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

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

Change-Id: If08069d45087fe406c7854551c34611f180c33f0