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

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

Change-Id: I20b6cd2928752765bffb6c30012a3750b1199f53