Merge "Add updated cpe for vulnerability scanners" am: 0e1b43076c am: fefd5d8aae am: 2b486bc3ad am: e155ba2e91

Original change: https://android-review.googlesource.com/c/platform/external/dnsmasq/+/1912488

Change-Id: Ie13e0992fc7aac05f50e72f13702e7c8b3b64e40