Refactor AndroidKeyMintDevice::update. am: 2cb22a42d9

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1596019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f11530f23470570ef5f96d6e0e4dc194b5421a1