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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb6d436dd68127004e9e3a36a95fad03959e656b