Merge "Update cpe for vulnerability scanners" am: 3477685ceb am: ac87915ca0 am: c7595b9b1e am: 11a39972e1

Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567

Change-Id: I338c60748464458a9a2ebbca519f04fdf70d3386