Merge "Fix DuplicateBranches errorprone issue" into main am: a11feecf7e am: 9c0e06f581 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3388621 Change-Id: I582e447f18b9f444093a6b9125bd0b751c3e00ac Signed-off-by: Automerger Merge Worker <[email protected]>