[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 32d48c8f61 -s ours am: dca182d958 -s ours

am skip reason: Change-Id I21aaf06e2e97afaae2492a54faf969c1d7d1d014 with SHA-1 5f7908063f is in history

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

Change-Id: Ia368804d3a2ed43a28198dd4dd626b9ca8bfcb78