Merge "Remove unnecessary giflib dependency." into main am: c4bbed0e am: f6f1b4d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3269892



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