Merge "Update udfps icon on lockscreen and AOD" into sc-dev