Merge "trusty: keymaster3: Modify TrustyKeymaster3Device::update method"