Merge "Rename BiometricHalDeathReported to be futute-proof and extendable"