[automerger skipped] Merge "Fix uses_libs properties for OneMedia." into aosp-main-future am: 768a8eb8 -s ours

am skip reason: Merged-In I13725bc7dccb1c4cb22f1cb2ea5a875ee927bf13 with SHA-1 a401cbee is already in history

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



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