Merge "Separate updateAad from update & other cleanups" am: 91f8c7c091

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1596894

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2687cb48602bf6c8b0dfcba6cb4191df01e72a65