Merge changes from topic "blk-strategy"

* changes:
  Use ro.keystore.boot_level_key.strategy
  Refactor L0 key handling ahead of fix