Merge "Update cpe for vulnerability scanners" am: 3477685ceb Original change: https://android-review.googlesource.com/c/platform/external/apache-xml/+/1913567 Change-Id: I91ad6a83ff829dd45736a66ef9bfd442aabea302