Refactor AndroidKeyMintDevice::update. am: 2cb22a42d9 am: e5bf14bbcc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I672e69c74882924dfecf77830995951dc855a284