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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieff782b61895488a1dc0e2470ba11c69d157667d