[automerger skipped] Merge "Fix uses_libs properties for Gallery2." into main am: b079a60ec0 -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: Iceca6590ab841e8a228328d6cf1cc679e7e4539f Signed-off-by: Automerger Merge Worker <[email protected]>