Merge changes from topic "punch_shared_libs" into main am: 114bff10ac am: d73ea53ce4

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3020272

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