Merge "Add updated cpe for vulnerability scanners" am: d89d1246e7 am: 9962dd71e5 am: c50a0e9ed0

Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1911995

Change-Id: Iabad3771a9e013714ebb55c493e7de5e51cfc846