Merge "CDD: Update CDD language for biometrics and lockscreen." into pi-dev
am: 873b9b75f8

Change-Id: I61e404ea58062cc46db6c48f1b065e371b26eb44