Merge "[automerger skipped] Merge "updates to libarect_headers to include in media apex modules" into tm-dev am: 1821df6cd7 am: 45b364ead0 -s ours" into tm-d1-dev-plus-aosp am: 2e01e24048 -s ours am: e2ec4b5ed2 -s ours

am skip reason: Merged-In I147609c9d72a0f30c092891cfca812ccbde53abf with SHA-1 9533de4ab5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/18721249

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