[automerger skipped] Merge Android U (ab/10368041) am: 8fec17690c -s ours am: c756c69d6e -s ours am: d0edb34fb9 -s ours am: c46b0f7f36 -s ours

am skip reason: Merged-In If9ba84c232f54ff803eeaf869107fd664eb23fb6 with SHA-1 b339e01604 is already in history

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

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