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

Change-Id: Idc19ec446ac917d9ade0fa663b53c0cb8aaf70ec