Merge "Don't set udfps icon visibility on illumination change" into sc-dev am:...

Merge "Don't set udfps icon visibility on illumination change" into sc-dev am: fa6a4283 am: 7aefa739

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

Change-Id: I212cf3c216c70d5017227075660747359052f45e