Merge "Enable int-in-bool-context warning" am: 34f3673f am: 94d3cfa3

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2001832



Change-Id: I6f6b967f775981bc60f27aa228971829a555f380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>