Merge "On-device signing: Make sure Keystore key has the correct boot level."