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

am skip reason: Merged-In Iab4145a18c9d216689d68b83adf747ec4f229ade with SHA-1 97679a7bf2 is already in history

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

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