Fix keyguard measurement bugs

Bug 7493748
Bug 7493764

Change-Id: I2182ec4347eefc80198e675684bc5d195f947763
2 files changed