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

am skip reason: Merged-In I3fe09a99e475637759f8ee1441dacfc30afa56d7 with SHA-1 dc342368dc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libbase/+/20949489

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