Adapt to enabling error level for the UnnecessaryParentheses bug pattern

Fix the current issues so that the build continues to work.

Bug: Issue 15082
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I8613c39127f74e82e12e4ee93a4f400038356eed