[automerger skipped] Merge "Fix uses_libs properties for Gallery2." into main am: b079a60ec0 -s ours am: af7768a491 -s ours

am skip reason: Merged-In Ib6c23c487a57644c0b4873350f84e043d5ad1528 with SHA-1 29c7778d6a is already in history

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

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