Merge "Add updated cpe for vulnerability scanners" am: 0355945e4f am: d9c2b90da2 am: 611f8baafc

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

Change-Id: I1519ab317cde48d4545cc5e1e78714a0244a77c0