Merge "Drop unused AuthorizationSet::Union method" am: e8861eb6ef am: c81cedf8b9

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

Change-Id: I3b7527afc2fb8df625284c49b4432bc76b2e7b9b