Merge "Restore password metrics after a credential-less unlock" into rvc-dev am: b9a49c8b am: f78d3763 am: 12fd59e7 Change-Id: I067cfcf9b399b0e6a6abbe2f0a866b71ddfd06b9