Make keymaster optional. am: cc68516bd2 am: d82de97ccf

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

Change-Id: I724a512370c15c4eeae63e70d1b48ea929bb64da