Merge "Fix Wbitwise-instead-of-logical introduced by clang-r445002" am: 9f165ca3e1 am: 665796dd6d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1961919

Change-Id: I6640db34b9ed6f3a4c64e0eb718c0eb0c725113e