Merge "Fix DuplicateBranches errorprone issue" into main am: a11feecf7e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/3388621

Change-Id: I0a8743cbb5d0aac3fca24ee182842ffbb7df643d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>