Make keymaster optional. am: cc68516bd2 am: d82de97ccf am: e7d8a2a19a

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

Change-Id: I906c62cc63e963d08d4d569019ac44286645000d