[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 2607b85f1f -s ours am: 2b44c465c5 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I23145a07d5ab4b76805baa58aad83336e372b4c9