[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 2f77493f5c -s ours am: 859b4b3dd2 -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: I5fd29670c0774c94d7fb4c477fe341cefcf49481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>