Mark ab/6881855 as merged

Bug: 172690556
Change-Id: I4b2e2ec2a3b72ac22464997cf373b26cc788d31e
diff --git a/soong/error_prone.go b/soong/error_prone.go
index 980065a..31fd5aa 100644
--- a/soong/error_prone.go
+++ b/soong/error_prone.go
@@ -392,6 +392,9 @@
 		"-Xep:StringSplitter:OFF",
 		// b/117877739.
 		"-Xep:TruthAssertExpected:OFF",
+		// b/170172949
+		"-Xep:MissingOverride:OFF",
+		"-Xep:UnnecessaryParentheses:OFF",
 	}
 
 	config.ErrorProneFlags = []string{