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

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

Change-Id: I13574248a71142c1b1c3d7d713f2ac6f5caa9e33