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