Merge "init: set ro.boot.flash.locked from ro.boot.verifiedbootstate"
am: 85abb0860e

* commit '85abb0860e4e8b74d8f4498b2b1b3cea44614aff':
  init: set ro.boot.flash.locked from ro.boot.verifiedbootstate