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

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

Change-Id: I53635960c1abd99dadaba8ffb76028670b4fe59e