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

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

Change-Id: I4845c9998d711452fa21c3d0d9d4fc4b97c1a853