Merge "Make operator bool() explicit" am: 08394bd24b am: 1dfed10364 am: 434acd3cc0 am: f6602c4b58

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

Change-Id: I31710b7f1350a9767c0aea76971ebfcf8a6fc164