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

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

Change-Id: I5423798f60735efc4c70574b578380f36ebfa9ce