Merge "[DO NOT MERGE] Show UDFPS icon on AOD even if fp auth isn't running" into sc-qpr1-dev