Merge "Support lib-blocklist and whole-static-libs." into main am: 362d304edd

Original change: https://android-review.googlesource.com/c/platform/development/+/2832831

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