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

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

Change-Id: I36c7ccc4a4bc518a0834a2478c0f0427679f58f6