Add biometrics to mapper. Change-Id: I84bb3db9ecfaff83d2ca49bf750cb2c6892cc246 Test: m Bug: 308024106