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

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

Change-Id: If64b9f87c7f4d02ed759053dfbfa5e76d4216507