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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee8222cab2c34d2d52c9c8adff84794e91335049