Merge "Fix DoubleBraceInitialization errorprone issues" into aosp-main-future