Merge "Use accessors for setting X509 signature and algorithm." am: 736e826a40 am: f01c278c5e

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

Change-Id: Ib3ecb7a89710263edcbf98d74573debe165ac051