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

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

Change-Id: I941a462c61f4f6e2ca766f79ded3b6f91badc0fe