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

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

Change-Id: Ia87b4edd99cd947d7202b946cea970d6608c4425