Merge "Use the factored out bug 24465209 workaround for libjnigraphics." into...

Merge "Use the factored out bug 24465209 workaround for libjnigraphics." into main am: be74c988 am: 5160f02b

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



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