Merge "Separate updateAad from update & other cleanups" am: 124f8c4cfd

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1595904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01ff215fca6eda46c1e8b3409c8cb62cdf1b1156