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

* commit '226914be6ad06f1ccbdcd2ea584e748a02665e2d':
  init: set ro.boot.flash.locked from ro.boot.verifiedbootstate