[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: cd878d5efc -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: I8bb85e3994d434372b777e3ab5653df0ac2ee8a1 Signed-off-by: Automerger Merge Worker <[email protected]>