aml_hef_341613000 (11465779,com.google.android.healthfitness)
Merge "Upgrade libpng to v1.6.39" am: cb9e209cab am: c05ebac440 am: 725d7d60ee

Original change: https://android-review.googlesource.com/c/platform/external/libpng/+/2435872

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