[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 6fb28acd9a -s ours

am skip reason: Merged-In Ic6ebbeef9109f7f5298846f13780b54e97c9503f with SHA-1 7fc9212b9a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libabigail/+/20948066

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