Merge "Don't set udfps icon visibility on illumination change" into sc-dev am: fa6a4283 am: 3d3f1883 am: eead12b5

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

Change-Id: I0584fc94e0eeef86e1d398e5aea6b707980cc8d2