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

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

Change-Id: I02f270d80cfd5ed2e42f2d14d7d67d5ec1ab522d