Merge "Revert^2 "generate_notice.py: don't check for strings we don't use any more."" into main am: 73d0d3520a

Original change: https://android-review.googlesource.com/c/platform/bionic/+/2864178

Change-Id: I7d7ebe4a067b2dcd8065afb0a2334442258a3f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>